use g_file_test() instead of long deprecated g_scanner_stat_mode().

Sun Jul 29 17:14:01 2001  Tim Janik  <timj@gtk.org>

        * gtk/gtkitemfactory.c (gtk_item_factory_parse_rc): use g_file_test()
        instead of long deprecated g_scanner_stat_mode().

diff --git a/ChangeLog b/ChangeLog
index e8f8700636928224aa3ebf2568edb5f25a9f6ab4..51952c6c7454c2adeb9f8743210942d7f5e7b26d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Jul 29 17:14:01 2001  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkitemfactory.c (gtk_item_factory_parse_rc): use g_file_test()
+       instead of long deprecated g_scanner_stat_mode().
+
 2001-07-29  Hans Breuer  <hans@breuer.org>
 
        * gdk/makefile.msc : build in the backend dir after

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index e8f8700636928224aa3ebf2568edb5f25a9f6ab4..51952c6c7454c2adeb9f8743210942d7f5e7b26d 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Sun Jul 29 17:14:01 2001  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkitemfactory.c (gtk_item_factory_parse_rc): use g_file_test()
+       instead of long deprecated g_scanner_stat_mode().
+
 2001-07-29  Hans Breuer  <hans@breuer.org>
 
        * gdk/makefile.msc : build in the backend dir after

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index e8f8700636928224aa3ebf2568edb5f25a9f6ab4..51952c6c7454c2adeb9f8743210942d7f5e7b26d 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Sun Jul 29 17:14:01 2001  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkitemfactory.c (gtk_item_factory_parse_rc): use g_file_test()
+       instead of long deprecated g_scanner_stat_mode().
+
 2001-07-29  Hans Breuer  <hans@breuer.org>
 
        * gdk/makefile.msc : build in the backend dir after

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index e8f8700636928224aa3ebf2568edb5f25a9f6ab4..51952c6c7454c2adeb9f8743210942d7f5e7b26d 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Sun Jul 29 17:14:01 2001  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkitemfactory.c (gtk_item_factory_parse_rc): use g_file_test()
+       instead of long deprecated g_scanner_stat_mode().
+
 2001-07-29  Hans Breuer  <hans@breuer.org>
 
        * gdk/makefile.msc : build in the backend dir after

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index e8f8700636928224aa3ebf2568edb5f25a9f6ab4..51952c6c7454c2adeb9f8743210942d7f5e7b26d 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Sun Jul 29 17:14:01 2001  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkitemfactory.c (gtk_item_factory_parse_rc): use g_file_test()
+       instead of long deprecated g_scanner_stat_mode().
+
 2001-07-29  Hans Breuer  <hans@breuer.org>
 
        * gdk/makefile.msc : build in the backend dir after

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index e8f8700636928224aa3ebf2568edb5f25a9f6ab4..51952c6c7454c2adeb9f8743210942d7f5e7b26d 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Sun Jul 29 17:14:01 2001  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkitemfactory.c (gtk_item_factory_parse_rc): use g_file_test()
+       instead of long deprecated g_scanner_stat_mode().
+
 2001-07-29  Hans Breuer  <hans@breuer.org>
 
        * gdk/makefile.msc : build in the backend dir after

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index e8f8700636928224aa3ebf2568edb5f25a9f6ab4..51952c6c7454c2adeb9f8743210942d7f5e7b26d 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Sun Jul 29 17:14:01 2001  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkitemfactory.c (gtk_item_factory_parse_rc): use g_file_test()
+       instead of long deprecated g_scanner_stat_mode().
+
 2001-07-29  Hans Breuer  <hans@breuer.org>
 
        * gdk/makefile.msc : build in the backend dir after

diff --git a/docs/reference/gtk/tmpl/gtk-unused.sgml b/docs/reference/gtk/tmpl/gtk-unused.sgml
index 397609a2b03f8c8483f72514e950f1c4eea07aa7..8c126874d3ee7672a7b166ac164651f0144aede5 100644 (file)
--- a/docs/reference/gtk/tmpl/gtk-unused.sgml
+++ b/docs/reference/gtk/tmpl/gtk-unused.sgml
@@ -384,6 +384,12 @@ Use to get the value of a GtkArg whose GtkType is GTK_TYPE_C_FOREIGN
 
 @a: 
 
+<!-- ##### ARG GtkAccelLabel:accel-widget ##### -->
+<para>
+The widget whose accelerators are to be shown by the #GtkAccelLabel.
+</para>
+
+
 <!-- ##### ARG GtkAccelLabel:accel-width ##### -->
 <para>
 

diff --git a/docs/reference/gtk/tmpl/gtkaccelgroup.sgml b/docs/reference/gtk/tmpl/gtkaccelgroup.sgml
index 2649b43277cc1eab5a21b7531ac8a6f81c9e20cd..40c4189c16a2eddaba116357bbf305f84ff60e75 100644 (file)
--- a/docs/reference/gtk/tmpl/gtkaccelgroup.sgml
+++ b/docs/reference/gtk/tmpl/gtkaccelgroup.sgml
@@ -19,10 +19,6 @@ Keyboard Accelerators
 
 </para>
 
-@ref_count: 
-@lock_count: 
-@modifier_mask: 
-@attach_objects: 
 
 <!-- ##### STRUCT GtkAccelEntry ##### -->
 <para>

diff --git a/docs/reference/gtk/tmpl/gtkaccellabel.sgml b/docs/reference/gtk/tmpl/gtkaccellabel.sgml
index 07710fe4d9c840e8ba100fb5ef75507d9e0ae819..9c61f558e6aad0cabb86a3e080eb44a549cb54f4 100644 (file)
--- a/docs/reference/gtk/tmpl/gtkaccellabel.sgml
+++ b/docs/reference/gtk/tmpl/gtkaccellabel.sgml
@@ -94,7 +94,7 @@ Creates a new #GtkAccelLabel.
 @Returns: a new #GtkAccelLabel.
 
 
-<!-- ##### FUNCTION gtk_accel_label_set_accel_widget ##### -->
+<!-- ##### MACRO gtk_accel_label_set_accel_widget ##### -->
 <para>
 Sets the widget whose accelerators are to be shown.
 </para>
@@ -125,8 +125,8 @@ accelerators are added or removed from the associated widget.
 @Returns: always returns FALSE.
 
 
-<!-- ##### ARG GtkAccelLabel:accel-widget ##### -->
+<!-- ##### ARG GtkAccelLabel:accel-object ##### -->
 <para>
-The widget whose accelerators are to be shown by the #GtkAccelLabel.
+
 </para>
 

diff --git a/docs/reference/gtk/tmpl/gtkmenu.sgml b/docs/reference/gtk/tmpl/gtkmenu.sgml
index 8bcfbb4ad2ade49b0c8d764dda78c023fe7d1f11..970ee42ab84d5137513478cdd6c47b79b7d087a3 100644 (file)
--- a/docs/reference/gtk/tmpl/gtkmenu.sgml
+++ b/docs/reference/gtk/tmpl/gtkmenu.sgml
@@ -96,9 +96,9 @@ Creates a new #GtkMenu.
 Adds a new #GtkMenuItem to the end of the menu's item list.
 </para>
 
+<!-- # Unused Parameters # -->
 @m: 
 @c: 
-<!-- # Unused Parameters # -->
 @menu: a #GtkMenu.
 @child: The #GtkMenuItem to add.
 
@@ -108,9 +108,9 @@ Adds a new #GtkMenuItem to the end of the menu's item list.
 Adds a new #GtkMenuItem to the beginning of the menu's item list.
 </para>
 
+<!-- # Unused Parameters # -->
 @m: 
 @c: 
-<!-- # Unused Parameters # -->
 @menu: a #GtkMenu.
 @child: The #GtkMenuItem to add.
 

diff --git a/docs/reference/gtk/tmpl/gtkrc.sgml b/docs/reference/gtk/tmpl/gtkrc.sgml
index 30ffca8235aa804f9d0033f0f1ed9b6a61d8fd94..cc0b23b6d217a6b8beefca09d47e350a7eb6068a 100644 (file)
--- a/docs/reference/gtk/tmpl/gtkrc.sgml
+++ b/docs/reference/gtk/tmpl/gtkrc.sgml
@@ -495,6 +495,7 @@ This can later be composited together with other
 #GtkRcStyle structures to form a #GtkStyle.
 </para>
 
+@parent_instance: 
 @name: 
 @bg_pixmap_name: 
 @font_desc: 

diff --git a/docs/reference/gtk/tmpl/gtkstyle.sgml b/docs/reference/gtk/tmpl/gtkstyle.sgml
index 73abe4c49f89e7db76bbba3e650e95fa5f46aae7..69acb5bddd8d00e7a8719c8de4a92a68d210a509 100644 (file)
--- a/docs/reference/gtk/tmpl/gtkstyle.sgml
+++ b/docs/reference/gtk/tmpl/gtkstyle.sgml
@@ -495,6 +495,8 @@ Styles
 @state_type: 
 @x: 
 @y: 
+@expander_style: 
+<!-- # Unused Parameters # -->
 @is_open: 
 
 
@@ -866,6 +868,8 @@ Styles
 @detail: 
 @x: 
 @y: 
+@expander_style: 
+<!-- # Unused Parameters # -->
 @is_open: 
 
 

diff --git a/gtk/gtkitemfactory.c b/gtk/gtkitemfactory.c
index d9c8b58ef65f37244af22bc591c5b3fe003b28c3..dcaa3a80f2a873291ca98dd14ddd3c99c767e286 100644 (file)
--- a/gtk/gtkitemfactory.c
+++ b/gtk/gtkitemfactory.c
@@ -45,7 +45,6 @@
 #include       "gtk/gtkstock.h"
 #include       "gtk/gtkiconfactory.h"
 #include       <string.h>
-#include       <sys/stat.h>
 #include       <fcntl.h>
 #ifdef HAVE_UNISTD_H
 #include       <unistd.h>
@@ -1754,7 +1753,7 @@ gtk_item_factory_parse_rc (const gchar      *file_name)
 
   g_return_if_fail (file_name != NULL);
 
-  if (!S_ISREG (g_scanner_stat_mode (file_name)))
+  if (!g_file_test (file_name, G_FILE_TEST_IS_REGULAR))
     return;
 
   fd = open (file_name, O_RDONLY);